DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master Bug: 120848293 Change-Id: If8fcf527912764c729e76f8f05389bcf3eb12396